Autogenerated HTML docs for v2.30.0-452-gfb7fa
diff --git a/git-diff-files.html b/git-diff-files.html index 51c8c99..49b10af 100644 --- a/git-diff-files.html +++ b/git-diff-files.html
@@ -2411,9 +2411,9 @@ <div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to produce a <em>combined diff</em> when showing a merge. This is the default format when showing merges with <a href="git-diff.html">git-diff(1)</a> or -<a href="git-show.html">git-show(1)</a>. Note also that you can give the <code>-m</code> option to any -of these commands to force generation of diffs with individual parents -of a merge.</p></div> +<a href="git-show.html">git-show(1)</a>. Note also that you can give suitable +<code>--diff-merges</code> option to any of these commands to force generation of +diffs in specific format.</p></div> <div class="paragraph"><p>A "combined diff" format looks like this:</p></div> <div class="listingblock"> <div class="content">
